Getting rid of explicit namings