refactor scala names a bit
pass sass lint