Resolved issues with name overlaping type