Revert "Fix consistencies in variable names"

This reverts commit e20f039e41238340d2d5316e5a08da7711dac501.