fixed renaming condition for declarations, also fixed using the wrong presence condition for renamings
Merge remote-tracking branch 'origin/master'