Rename couple enums to comply wit the the coding conventions (keep the old names also around for now in order not to break code).