Renaming Functions and macros

Thanks!!! You guys are great xD