Add body/shape/fixture/sensor naming for proper retrieval/removal