Refactor: change internal names (it was confusing). Thanks to Tom for his help