Refactor get-id to make-id