fixes naming bug
Merge commit '2a43ab4c5de478068a1b4e0db453758fd31e5fb7'