Change enums... to you know... actually enums, not static variables classes