CLEANUP: Relocated and renamed atom capitalization.