Renamed several parameters for consistency. Made an unnecessarily abstract property into a concrete property that is inheretid