Fix skeleton, change names