Fix double naming issue