Use an even better naming scheme