Change some variable names for better code understanding