Additions to location naming.