Minor: some tiny variable name changes, oscillator