Refactor names in XS