Applied some rename and refactor tasks.