Fixes and change naming

being reviewed at: https://rbcommons.com/s/OpenH264/r/873/