Renamed ContentManager. Minor Findbugs corrections