Fix warnings for constant names