Fix capitalization errors and confusing names