Renaming types
Updated README