Variable names revision to make the code more understandable