some code changes for common name clean up.