resolved naming issues