More naming rationalisation, plus owned writes implemented