Made variable names for super() calls consistent