[WIP] Renaming after rebase

This code won't be seeing the light of day anyway...