Fixing imports and variable names