Rename stuff
Update pocman upper bound