Fixing issues, update naming standards