Renamings and other improvements to SourceCodeServices API