Fixed terrible naming convention