Corrected upper/lowercase issues