Fix prefixed constant names