rename variables for consistency, cache machinestates