unicorn naming fixes