Rename/change capitalization for consistency