Update file naming convention and improve text