Added CLASS_ID and changed Identifiers (Identifiers always start with a
lower-case letter and can include underscores as well).