Fixed "Capitalization" issues