Apply better naming scheme
Add macros for easy swizzling