refactor(interfaces) Add renamed stuff & use methods instead of properties