Fixed some issues that Devon pointed out with case and consistency