rename enums
finish some views