WIP reflect refactor, tidy up registrar terminology Enumeration/Composite/Class vs Enum/Structure/Object