Switching to @ variable names