added more cases to name.py