Fixed some over-enthusiastic automatic renaming by IntelliJ.