ITTE-1159 Bether naming for server windows 


Signed-off-by: simeon iliev <simeon.iliev.bg@gmail.com>