fixed new nameing convention