Fixing overlapping and naming problems