Completion/resolving/rename refactoring

Don't forget regenerate parser