More work on making all variable names pascal case