fixing nameing convention