Rename variables to make code fit Python naming conventions. Some
tidying up of ibccperformance module