Minor touchups (variable / internal class names)