Fixing double naming problem