Fix some php doc and cs
Rename methods