Fixing wrong naming way