renaming and better log messages
last renaming