Refactor id prefixing slightly