Keeping wallmai happy with names