Changed the names to fit the servlet