changed naming to allow rails magic