Starting to functionalize names

Initial changes to add naming functions rather than naming macros