rename defines that should be classes