Made variable names more restrictive