Renaming and extending some enums and strings for re-use