Adding correct payment pages and aligning naming