Renaming: Variable names and JavaDocs