Change in letter case and organization issue fixes