[#474] Capitalization tweaks