Changed some variable and function names

2 jobs for feature/restructuring-files in 1 minute and 21 seconds (queued for 2 seconds)