Feature/1403 tern rename

See #1403 for animated screenshot