clean up model architecture variable names