Small adjustment with regards to renaming.