rename namespaces to match bundle name; update to work with latest symfony