Switching to new definitions.