Fixes & renaming of files related to registry/factory/managers rework