resolved duplicate naming