Cleaning up naming for {starred, unstarred} sources