changed namespaces to final 4.0 ones