Updating naming convention, improving macros