Got rid of superfluous namespace prefixes