file naming consistency
minor pipeline rule cleanups