Cleaned up storehouse variable names.