Fix naming and specifics