Fixed pdf generation, added naming convention