diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65922b4..54c687a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - required PHP version to 7.1
+- organization and names for Record classes
 
 ### Deprecated
 - old format of hook events
diff --git a/config/psalm.xml b/config/psalm.xml
index 497d40c..b4ba3cf 100644
--- a/config/psalm.xml
+++ b/config/psalm.xml
@@ -26,17 +26,17 @@
         <MixedArgument>
             <errorLevel type="suppress">
                 <file name="src/Provider/Record_Provider.php" />
-                <file name="src/Record/Hook_Record_Collector.php" />
+                <file name="src/Record/Collector/Hook_Collector.php" />
             </errorLevel>
         </MixedArgument>
         <MissingClosureParamType>
             <errorLevel type="suppress">
-                <file name="src/Record/Hook_Record_Collector.php" />
+                <file name="src/Record/Collector/Hook_Collector.php" />
             </errorLevel>
         </MissingClosureParamType>
         <MissingClosureReturnType>
             <errorLevel type="suppress">
-                <file name="src/Record/Hook_Record_Collector.php" />
+                <file name="src/Record/Collector/Hook_Collector.php" />
             </errorLevel>
         </MissingClosureReturnType>
     </issueHandlers>
diff --git a/src/Event/Hook_Event_Config_Interface.php b/src/Event/Hook_Event_Config_Interface.php
index b0c8fd3..fdef3cb 100644
--- a/src/Event/Hook_Event_Config_Interface.php
+++ b/src/Event/Hook_Event_Config_Interface.php
@@ -3,13 +3,15 @@ declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
+use Rarst\Laps\Record\Collector\Hook_Collector;
+
 /**
  * Interface to retrieve configuration array of hook events to track.
  */
 interface Hook_Event_Config_Interface {
 
 	/**
-	 * @see Hook_Record_Collector::add_event()
+	 * @see Hook_Collector::add_event()
 	 *
 	 * @return array[]
 	 */
diff --git a/src/Formatter/Hook_Formatter.php b/src/Formatter/Hook_Formatter.php
index b75cdef..77058c9 100644
--- a/src/Formatter/Hook_Formatter.php
+++ b/src/Formatter/Hook_Formatter.php
@@ -32,7 +32,7 @@ class Hook_Formatter {
 					$closure  = new \ReflectionFunction( $callback );
 					$callback = 'closure from ' . $closure->getFileName() . '::' . $closure->getStartLine();
 
-					if ( false !== strpos( $callback, 'Hook_Record_Collector' ) ) {
+					if ( false !== strpos( $callback, 'Hook_Collector' ) ) {
 						continue;
 					}
 				} elseif ( is_object( $callback ) ) {
diff --git a/src/Provider/Record_Provider.php b/src/Provider/Record_Provider.php
index 03c23bb..e72a37a 100644
--- a/src/Provider/Record_Provider.php
+++ b/src/Provider/Record_Provider.php
@@ -6,11 +6,11 @@ namespace Rarst\Laps\Provider;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Rarst\Laps\Plugin;
-use Rarst\Laps\Record\Core_Load_Collector;
-use Rarst\Laps\Record\Hook_Record_Collector;
-use Rarst\Laps\Record\Http_Record_Collector;
-use Rarst\Laps\Record\Record_Collector_Interface;
-use Rarst\Laps\Record\Sql_Record_Collector;
+use Rarst\Laps\Record\Collector\Core_Load_Collector;
+use Rarst\Laps\Record\Collector\Hook_Collector;
+use Rarst\Laps\Record\Collector\Http_Collector;
+use Rarst\Laps\Record\Collector\Record_Collector_Interface;
+use Rarst\Laps\Record\Collector\Sql_Collector;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -30,9 +30,9 @@ class Record_Provider implements ServiceProviderInterface, Bootable_Provider_Int
 		$pimple['collectors'] = function ( Plugin $laps ): array {
 			return [
 				'core' => new Core_Load_Collector(),
-				'hook' => new Hook_Record_Collector( $laps['stopwatch'], $laps['hook.events'] ),
-				'http' => new Http_Record_Collector( $laps['stopwatch'] ),
-				'sql'  => new Sql_Record_Collector(),
+				'hook' => new Hook_Collector( $laps['stopwatch'], $laps['hook.events'] ),
+				'http' => new Http_Collector( $laps['stopwatch'] ),
+				'sql'  => new Sql_Collector(),
 			];
 		};
 
diff --git a/src/Record/Core_Load_Collector.php b/src/Record/Collector/Core_Load_Collector.php
similarity index 89%
rename from src/Record/Core_Load_Collector.php
rename to src/Record/Collector/Core_Load_Collector.php
index d946f3b..7076ee9 100644
--- a/src/Record/Core_Load_Collector.php
+++ b/src/Record/Collector/Core_Load_Collector.php
@@ -1,7 +1,10 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Record\Record;
+use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Covers pre–plugin load time from available data.
diff --git a/src/Record/Hook_Record_Collector.php b/src/Record/Collector/Hook_Collector.php
similarity index 97%
rename from src/Record/Hook_Record_Collector.php
rename to src/Record/Collector/Hook_Collector.php
index a81c65f..3cd1456 100644
--- a/src/Record/Hook_Record_Collector.php
+++ b/src/Record/Collector/Hook_Collector.php
@@ -1,17 +1,18 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
 
 use Rarst\Laps\Event\Hook_Event_Config_Interface;
 use Rarst\Laps\Formatter\Hook_Formatter;
+use Rarst\Laps\Record\Stopwatch_Record;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
 /**
  * Processes events based on hooked starts and stops.
  */
-class Hook_Record_Collector extends Stopwatch_Record_Collector {
+class Hook_Collector extends Stopwatch_Collector {
 
 	/** @var Hook_Event_Config_Interface[] $event_configs */
 	protected $event_configs = [];
diff --git a/src/Record/Http_Record_Collector.php b/src/Record/Collector/Http_Collector.php
similarity index 94%
rename from src/Record/Http_Record_Collector.php
rename to src/Record/Collector/Http_Collector.php
index ed9a2f2..43e3c9b 100644
--- a/src/Record/Http_Record_Collector.php
+++ b/src/Record/Collector/Http_Collector.php
@@ -1,16 +1,17 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
 
 use Rarst\Laps\Formatter\Backtrace_Formatter;
+use Rarst\Laps\Record\Stopwatch_Record;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
 /**
  * Captures time of network requests made with HTTP API.
  */
-class Http_Record_Collector extends Stopwatch_Record_Collector {
+class Http_Collector extends Stopwatch_Collector {
 
 	/** @var Backtrace_Formatter */
 	private $formatter;
diff --git a/src/Record/Record_Collector_Interface.php b/src/Record/Collector/Record_Collector_Interface.php
similarity index 73%
rename from src/Record/Record_Collector_Interface.php
rename to src/Record/Collector/Record_Collector_Interface.php
index f4854cb..34fe4db 100644
--- a/src/Record/Record_Collector_Interface.php
+++ b/src/Record/Collector/Record_Collector_Interface.php
@@ -1,7 +1,9 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Interface to retrieve a set of records form collector.
diff --git a/src/Record/Sql_Record_Collector.php b/src/Record/Collector/Sql_Collector.php
similarity index 95%
rename from src/Record/Sql_Record_Collector.php
rename to src/Record/Collector/Sql_Collector.php
index 1fe142a..d11a048 100644
--- a/src/Record/Sql_Record_Collector.php
+++ b/src/Record/Collector/Sql_Collector.php
@@ -1,14 +1,15 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
 
 use Rarst\Laps\Formatter\Backtrace_Formatter;
+use Rarst\Laps\Record\Record;
 
 /**
  * Processes SQL events from data logged by wpdb.
  */
-class Sql_Record_Collector implements Record_Collector_Interface {
+class Sql_Collector implements Record_Collector_Interface {
 
 	/** @var array $query_starts Log of query start times. */
 	protected $query_starts = [];
diff --git a/src/Record/Stopwatch_Record_Collector.php b/src/Record/Collector/Stopwatch_Collector.php
similarity index 91%
rename from src/Record/Stopwatch_Record_Collector.php
rename to src/Record/Collector/Stopwatch_Collector.php
index 8e5aed7..cbebdc0 100644
--- a/src/Record/Stopwatch_Record_Collector.php
+++ b/src/Record/Collector/Stopwatch_Collector.php
@@ -1,15 +1,16 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
 
+use Rarst\Laps\Record\Stopwatch_Record;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
 /**
  * Generic Stopwatch–based collector. Can be used by itself or extended.
  */
-class Stopwatch_Record_Collector implements Record_Collector_Interface {
+class Stopwatch_Collector implements Record_Collector_Interface {
 
 	/** @var Stopwatch $stopwatch */
 	protected $stopwatch;
diff --git a/tests/Record/CoreTest.php b/tests/Record/CoreTest.php
index d549467..0883bd1 100644
--- a/tests/Record/CoreTest.php
+++ b/tests/Record/CoreTest.php
@@ -2,7 +2,7 @@
 
 namespace Rarst\Laps\Tests\Record;
 
-use Rarst\Laps\Record\Core_Load_Collector;
+use Rarst\Laps\Record\Collector\Core_Load_Collector;
 use Rarst\Laps\Record\Record_Interface;
 use Rarst\Laps\Tests\LapsTestCase;
 
diff --git a/tests/Record/HookTest.php b/tests/Record/HookTest.php
index 3c0b76b..758e229 100644
--- a/tests/Record/HookTest.php
+++ b/tests/Record/HookTest.php
@@ -4,7 +4,7 @@ declare( strict_types=1 );
 namespace Rarst\Laps\Tests\Record;
 
 use Rarst\Laps\Event\Core_Events;
-use Rarst\Laps\Record\Hook_Record_Collector;
+use Rarst\Laps\Record\Collector\Hook_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 
@@ -13,7 +13,7 @@ class HookTest extends LapsTestCase {
 	public function testCollector() {
 
 		$stopwatch = new Stopwatch();
-		$collector = new Hook_Record_Collector( $stopwatch, [ 'core' => new Core_Events() ] );
+		$collector = new Hook_Collector( $stopwatch, [ 'core' => new Core_Events() ] );
 
 		$this->assertTrue( $stopwatch->isStarted( 'Plugins Load' ) );
 		$this->assertTrue( has_action( 'after_setup_theme', [ $collector, 'after_setup_theme' ] ) );
diff --git a/tests/Record/HttpTest.php b/tests/Record/HttpTest.php
index ad615ce..c66aae3 100644
--- a/tests/Record/HttpTest.php
+++ b/tests/Record/HttpTest.php
@@ -3,7 +3,7 @@
 namespace Rarst\Laps\Tests\Record;
 
 use Brain\Monkey\Functions;
-use Rarst\Laps\Record\Http_Record_Collector;
+use Rarst\Laps\Record\Collector\Http_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 
@@ -16,7 +16,7 @@ class HttpTest extends LapsTestCase {
 
 		$stopwatch = new Stopwatch();
 		$url       = 'https://example.com/';
-		$collector = new Http_Record_Collector( $stopwatch );
+		$collector = new Http_Collector( $stopwatch );
 
 		$this->assertTrue( has_action( 'pre_http_request', [ $collector, 'pre_http_request' ] ) );
 		$this->assertTrue( has_action( 'http_api_debug', [ $collector, 'http_api_debug' ] ) );
diff --git a/tests/Record/SqlTest.php b/tests/Record/SqlTest.php
index e42b5c3..89c9cf4 100644
--- a/tests/Record/SqlTest.php
+++ b/tests/Record/SqlTest.php
@@ -4,13 +4,13 @@ namespace Rarst\Laps\Tests\Record;
 
 use Brain\Monkey\Functions;
 use Rarst\Laps\Record\Record;
-use Rarst\Laps\Record\Sql_Record_Collector;
+use Rarst\Laps\Record\Collector\Sql_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 
 class SqlTest extends LapsTestCase {
 
 	/**
-	 * @covers \Rarst\Laps\Record\Sql_Record_Collector
+	 * @covers \Rarst\Laps\Record\Collector\Sql_Collector
 	 */
 	public function testCollector() {
 
@@ -22,7 +22,7 @@ class SqlTest extends LapsTestCase {
 		}
 		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
 
-		$collector = new Sql_Record_Collector();
+		$collector = new Sql_Collector();
 
 		$this->assertTrue( has_filter( 'query', [ $collector, 'query' ] ) );
 
diff --git a/tests/Record/StopwatchTest.php b/tests/Record/StopwatchTest.php
index f8c6086..e36df26 100644
--- a/tests/Record/StopwatchTest.php
+++ b/tests/Record/StopwatchTest.php
@@ -3,7 +3,7 @@
 namespace Rarst\Laps\Tests\Record;
 
 use Rarst\Laps\Record\Stopwatch_Record;
-use Rarst\Laps\Record\Stopwatch_Record_Collector;
+use Rarst\Laps\Record\Collector\Stopwatch_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
@@ -11,11 +11,11 @@ use Symfony\Component\Stopwatch\StopwatchEvent;
 class StopwatchTest extends LapsTestCase {
 
 	/**
-	 * @covers \Rarst\Laps\Record\Stopwatch_Record_Collector
+	 * @covers \Rarst\Laps\Record\Collector\Stopwatch_Collector
 	 */
 	public function testCollector() {
 
-		$collector = new Stopwatch_Record_Collector( new Stopwatch() );
+		$collector = new Stopwatch_Collector( new Stopwatch() );
 
 		$collector->start( 'Event', 'info' );
 		$collector->start( 'Not stopped', 'info' );