Should fix double naming issue