A few little updates and file name changes