Fixing naming usage inside Map