Updates and cleanup to names.