Remove old files; Update names to match standards.