Adjust name inflector logic to be more flexible