Made init param names consistent. Moved some to context.xml