Adopt to renaming