Fix all caps issue