Jr. Sr. Problem in NSO Birth Certificate

I have two Sons... My eldest child shows in NSO Birth Certificate as:

First Name: Angelo Jr
Middle Name: Reyes
Surname: Garcia

Father
First Name: Angelo Sr
Middle Name: Reyes
Surname: Garcia

However many people in his school said it is wrong... Writing the Full Name should be Angelo Jr Reyes Garcia (Not Angelo Reyes Garcia Jr. as we intended to)...

Also my second son name shows in NSO Birth Certificate as:

First Name: Mike
Middle Name: Reyes
Surname: Garcia

Father
First Name: Angelo
Middle Name: Reyes
Surname: Garcia

We have no problem with having Angelo Jr Garcia instead of Angelo Garcia Jr. However I need to remove the Sr in Father First Name: Angelo Sr of my eldest Son's NSO Birth Certificate... How can I do this?

Did some googling in the net... And it says there that Jr. should follow the first name because it is the First Name you are Junior and not the Last Name... So is my son name correct? Please advice:

First Name: Angelo Jr
Middle Name: Reyes
Surname: Garcia

To be written as Angelo Reyes Garcia Jr. ?

how to use I, II, III in person's name?