Only constants should be uppercased
Couple more instances need to be lowercase
Deprecate this argument, which should be a part of construct anyway