changed it so the proper naming scheme is done