Fix compilation errors introduced by renaming AbstractComponentContainer