More cleanup of manual file names of built-in features