Rename method and use environment variable properly