diff --git a/Classes/PHPExcel/Chart.php b/Classes/PHPExcel/Chart.php
index b9146b34..9bf72dbb 100644
--- a/Classes/PHPExcel/Chart.php
+++ b/Classes/PHPExcel/Chart.php
@@ -115,14 +115,14 @@ class PHPExcel_Chart
   /**
    * Chart Major Gridlines as
    *
-   * @var PHPExcel_Chart_Gridlines
+   * @var PHPExcel_Chart_GridLines
    */
   private $_majorGridlines = null;
 
   /**
    * Chart Minor Gridlines as
    *
-   * @var PHPExcel_Chart_Gridlines
+   * @var PHPExcel_Chart_GridLines
    */
   private $_minorGridlines = null;
 
@@ -177,7 +177,7 @@ class PHPExcel_Chart
 	/**
 	 * Create a new PHPExcel_Chart
 	 */
-	public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, PHPExcel_Chart_Axis $xAxis = null, PHPExcel_Chart_Axis $yAxis = null, PHPExcel_Chart_Gridlines $majorGridlines = null, PHPExcel_Chart_Gridlines $minorGridlines = null)
+	public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, PHPExcel_Chart_Axis $xAxis = null, PHPExcel_Chart_Axis $yAxis = null, PHPExcel_Chart_GridLines $majorGridlines = null, PHPExcel_Chart_GridLines $minorGridlines = null)
 	{
 		$this->_name = $name;
 		$this->_title = $title;
@@ -387,27 +387,27 @@ class PHPExcel_Chart
   /**
    * Get Major Gridlines
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
   public function getMajorGridlines() {
     if($this->_majorGridlines !== NULL){
       return $this->_majorGridlines;
     }
 
-    return new PHPExcel_Chart_Gridlines();
+    return new PHPExcel_Chart_GridLines();
   }
 
   /**
    * Get Minor Gridlines
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
   public function getMinorGridlines() {
     if($this->_minorGridlines !== NULL){
       return $this->_minorGridlines;
     }
 
-    return new PHPExcel_Chart_Gridlines();
+    return new PHPExcel_Chart_GridLines();
   }
 
 
diff --git a/Classes/PHPExcel/Chart/GridLines.php b/Classes/PHPExcel/Chart/GridLines.php
index 7467ea7e..269860ca 100644
--- a/Classes/PHPExcel/Chart/GridLines.php
+++ b/Classes/PHPExcel/Chart/GridLines.php
@@ -7,7 +7,7 @@ require_once 'Properties.php';
  * Time: 2:36 PM
  */
 
-class PHPExcel_Chart_Gridlines extends
+class PHPExcel_Chart_GridLines extends
   PHPExcel_Properties {
 
   /**
@@ -90,7 +90,7 @@ class PHPExcel_Chart_Gridlines extends
   /**
    * Change Object State to True
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _activateObject() {
@@ -229,7 +229,7 @@ class PHPExcel_Chart_Gridlines extends
    *
    * @param float $size
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setGlowSize($size) {
@@ -245,7 +245,7 @@ class PHPExcel_Chart_Gridlines extends
    * @param int $alpha
    * @param string $type
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setGlowColor($color, $alpha, $type) {
@@ -307,7 +307,7 @@ class PHPExcel_Chart_Gridlines extends
    *
    * @param int $shadow_presets
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setShadowPresetsProperties($shadow_presets) {
@@ -323,7 +323,7 @@ class PHPExcel_Chart_Gridlines extends
    * @param array $properties_map
    * @param * $reference
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setShadowProperiesMapValues(array $properties_map, &$reference = NULL) {
@@ -355,7 +355,7 @@ class PHPExcel_Chart_Gridlines extends
    * @param int $alpha
    * @param string $type
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setShadowColor($color, $alpha, $type) {
@@ -377,7 +377,7 @@ class PHPExcel_Chart_Gridlines extends
    *
    * @param float $blur
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setShadowBlur($blur) {
@@ -393,7 +393,7 @@ class PHPExcel_Chart_Gridlines extends
    *
    * @param int $angle
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setShadowAngle($angle) {
@@ -409,7 +409,7 @@ class PHPExcel_Chart_Gridlines extends
    *
    * @param float $distance
    *
-   * @return PHPExcel_Chart_Gridlines
+   * @return PHPExcel_Chart_GridLines
    */
 
   private function _setShadowDistance($distance) {
diff --git a/Classes/PHPExcel/Writer/Excel2007/Chart.php b/Classes/PHPExcel/Writer/Excel2007/Chart.php
index ceb750ad..4846910f 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Chart.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Chart.php
@@ -239,8 +239,8 @@ class PHPExcel_Writer_Excel2007_Chart extends
       PHPExcel_Worksheet $pSheet,
       PHPExcel_Chart_Axis $xAxis,
       PHPExcel_Chart_Axis $yAxis,
-      PHPExcel_Chart_Gridlines $majorGridlines,
-      PHPExcel_Chart_Gridlines $minorGridlines
+      PHPExcel_Chart_GridLines $majorGridlines,
+      PHPExcel_Chart_GridLines $minorGridlines
   ) {
     if (is_null($plotArea)) {
       return;