Take name tweaks