[#47] Partial rename