Converted common subclass fields to superclass + accessors
Added missing toUpperCase() call back