Fixed naming closes #1685