Rename macros, updated readme.