Fix #124: wrong naming conventions