optimize some names