[BUGFIX] Various bugfixes for variable and method naming

Replaces: #28