Issue22 standardize capitalization