Named some variables from KWD (from code by Tomasz Lis)