The names are hard to understand and also seem to break build on at least some solaris
versions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>