Resolved naming issues