Mixed up my naming conventions