added all labels, little namespase fixes
final namespace fixes
more lexical method's names for controllers