Changed Enums from plural to singular and Changed package names.