change some variable names for requirements fitting