diff --git a/elevate-cpanel b/elevate-cpanel
index 306ca23b2..78140d118 100755
--- a/elevate-cpanel
+++ b/elevate-cpanel
@@ -8727,13 +8727,13 @@ sub run ( $pkg, @args ) {
     return 0;
 }
 
-sub component ( $self, $name ) {    # FIXME -> get_component
+sub get_component ( $self, $name ) {
     my $pkg = qq[Elevate::Components::$name];
 
     # my $sub = $pkg->can( 'new' ) or die qq[Missing new from $pkg];
     # my $x = $sub->( $pkg, cpev => $self );
     # return $x;
-    return $pkg->new( cpev => $self );
+    return $pkg->new( components => $self->components );
 }
 
 sub get_blocker ( $self, $name ) {    # helper for tests
@@ -9469,7 +9469,7 @@ sub run_stage_5 ($self) {
 
 sub run_component_once ( $self, $name, $function ) {
 
-    my $component = $self->component($name);
+    my $component = $self->get_component($name);
     my $label     = "component:$name:$function";
     my $sub       = $component->can($function)     #
       or die qq[Missing functon $function from component '$name'];
diff --git a/script/elevate-cpanel.PL b/script/elevate-cpanel.PL
index 8e26549b0..61d13f790 100755
--- a/script/elevate-cpanel.PL
+++ b/script/elevate-cpanel.PL
@@ -431,13 +431,13 @@ sub run ( $pkg, @args ) {
     return 0;
 }
 
-sub component ( $self, $name ) {    # FIXME -> get_component
+sub get_component ( $self, $name ) {
     my $pkg = qq[Elevate::Components::$name];
 
     # my $sub = $pkg->can( 'new' ) or die qq[Missing new from $pkg];
     # my $x = $sub->( $pkg, cpev => $self );
     # return $x;
-    return $pkg->new( cpev => $self );
+    return $pkg->new( components => $self->components );
 }
 
 sub get_blocker ( $self, $name ) {    # helper for tests
@@ -1173,7 +1173,7 @@ sub run_stage_5 ($self) {
 
 sub run_component_once ( $self, $name, $function ) {
 
-    my $component = $self->component($name);
+    my $component = $self->get_component($name);
     my $label     = "component:$name:$function";
     my $sub       = $component->can($function)     #
       or die qq[Missing functon $function from component '$name'];