EstimateId renamed to ProposalId. ProjectEstimatesController renamed to ProposalController