Final span naming changes