Changed namespace syntax (short names)