Fixed wrongly names vars