Updated Naming (removed some remaining occurences of yagni)