Code cleanup. Name normalization.