Resolving more name issues...
All issues with naming and capitalization should be fixed.