Fixed method and exception naming closes #1543