Support lower case and change variable name