Different naming schema to allow both versions to live together.