Minor renamings
Extracted RPM control