Better nameing