Completing renames of classes and adding in call to the invoker components