Fix annoying naming issue