naming changed

all namespaces and names checked and where needed renamed to right name
spaces