Changed naming convention

Makes life in the IDE easier