diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
index a38e14734..5d9a8f9fa 100644
--- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
@@ -78,7 +78,7 @@ import com.omertron.themoviedbapi.model.person.ContentRating;
 import com.omertron.themoviedbapi.model.person.CreditInfo;
 import com.omertron.themoviedbapi.model.person.ExternalID;
 import com.omertron.themoviedbapi.model.person.Person;
-import com.omertron.themoviedbapi.model.person.PersonCredits;
+import com.omertron.themoviedbapi.model.person.PersonCreditList;
 import com.omertron.themoviedbapi.model.person.PersonFind;
 import com.omertron.themoviedbapi.model.review.Review;
 import com.omertron.themoviedbapi.model.tv.TVBasic;
@@ -1131,7 +1131,7 @@ public class TheMovieDbApi {
      * @return
      * @throws MovieDbException
      */
-    public PersonCredits getPersonMovieCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
+    public PersonCreditList getPersonMovieCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
         return tmdbPeople.getPersonMovieCredits(personId, language, appendToResponse);
     }
 
@@ -1148,7 +1148,7 @@ public class TheMovieDbApi {
      * @return
      * @throws MovieDbException
      */
-    public PersonCredits getPersonTVCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
+    public PersonCreditList getPersonTVCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
         return tmdbPeople.getPersonTVCredits(personId, language, appendToResponse);
     }
 
@@ -1165,7 +1165,7 @@ public class TheMovieDbApi {
      * @return
      * @throws MovieDbException
      */
-    public PersonCredits getPersonCombinedCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
+    public PersonCreditList getPersonCombinedCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
         return tmdbPeople.getPersonCombinedCredits(personId, language, appendToResponse);
     }
 
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java
index 987db6c69..bcac45c7a 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java
@@ -27,12 +27,12 @@ import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
 import com.omertron.themoviedbapi.model.artwork.Artwork;
 import com.omertron.themoviedbapi.model.artwork.ArtworkMedia;
 import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
-import com.omertron.themoviedbapi.model.person.CreditBasic;
-import com.omertron.themoviedbapi.model.person.CreditMovieBasic;
-import com.omertron.themoviedbapi.model.person.CreditTVBasic;
+import com.omertron.themoviedbapi.model.credits.CreditBasic;
+import com.omertron.themoviedbapi.model.credits.CreditMovieBasic;
+import com.omertron.themoviedbapi.model.credits.CreditTVBasic;
 import com.omertron.themoviedbapi.model.person.ExternalID;
 import com.omertron.themoviedbapi.model.person.Person;
-import com.omertron.themoviedbapi.model.person.PersonCredits;
+import com.omertron.themoviedbapi.model.person.PersonCreditList;
 import com.omertron.themoviedbapi.model.person.PersonCreditsMixIn;
 import com.omertron.themoviedbapi.model.person.PersonFind;
 import com.omertron.themoviedbapi.results.ResultList;
@@ -97,7 +97,7 @@ public class TmdbPeople extends AbstractMethod {
      * @return
      * @throws MovieDbException
      */
-    public PersonCredits<CreditMovieBasic> getPersonMovieCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
+    public PersonCreditList<CreditMovieBasic> getPersonMovieCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
         TmdbParameters parameters = new TmdbParameters();
         parameters.add(Param.ID, personId);
         parameters.add(Param.LANGUAGE, language);
@@ -107,7 +107,7 @@ public class TmdbPeople extends AbstractMethod {
         String webpage = httpTools.getRequest(url);
 
         try {
-            TypeReference tr = new TypeReference<PersonCredits<CreditMovieBasic>>() {
+            TypeReference tr = new TypeReference<PersonCreditList<CreditMovieBasic>>() {
             };
             return MAPPER.readValue(webpage, tr);
         } catch (IOException ex) {
@@ -130,7 +130,7 @@ public class TmdbPeople extends AbstractMethod {
      * @return
      * @throws MovieDbException
      */
-    public PersonCredits<CreditTVBasic> getPersonTVCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
+    public PersonCreditList<CreditTVBasic> getPersonTVCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
         TmdbParameters parameters = new TmdbParameters();
         parameters.add(Param.ID, personId);
         parameters.add(Param.LANGUAGE, language);
@@ -140,7 +140,7 @@ public class TmdbPeople extends AbstractMethod {
         String webpage = httpTools.getRequest(url);
 
         try {
-            TypeReference tr = new TypeReference<PersonCredits<CreditTVBasic>>() {
+            TypeReference tr = new TypeReference<PersonCreditList<CreditTVBasic>>() {
             };
             return MAPPER.readValue(webpage, tr);
         } catch (IOException ex) {
@@ -163,7 +163,7 @@ public class TmdbPeople extends AbstractMethod {
      * @return
      * @throws MovieDbException
      */
-    public PersonCredits<CreditBasic> getPersonCombinedCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
+    public PersonCreditList<CreditBasic> getPersonCombinedCredits(int personId, String language, String... appendToResponse) throws MovieDbException {
         TmdbParameters parameters = new TmdbParameters();
         parameters.add(Param.ID, personId);
         parameters.add(Param.LANGUAGE, language);
@@ -174,8 +174,8 @@ public class TmdbPeople extends AbstractMethod {
 
         try {
             ObjectMapper mapper = new ObjectMapper();
-            mapper.addMixIn(PersonCredits.class, PersonCreditsMixIn.class);
-            TypeReference tr = new TypeReference<PersonCredits<CreditBasic>>() {
+            mapper.addMixIn(PersonCreditList.class, PersonCreditsMixIn.class);
+            TypeReference tr = new TypeReference<PersonCreditList<CreditBasic>>() {
             };
             return mapper.readValue(webpage, tr);
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/CreditBasic.java b/src/main/java/com/omertron/themoviedbapi/model/credits/CreditBasic.java
similarity index 92%
rename from src/main/java/com/omertron/themoviedbapi/model/person/CreditBasic.java
rename to src/main/java/com/omertron/themoviedbapi/model/credits/CreditBasic.java
index de8a75c43..6c0768991 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/CreditBasic.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/credits/CreditBasic.java
@@ -18,7 +18,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.person;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
@@ -43,7 +43,7 @@ public class CreditBasic extends AbstractJsonMapping implements Serializable, II
     @JsonProperty("id")
     private int id;
     @JsonProperty("poster_path")
-    private String posterPath;
+    private String artworkPath;
 
     //cast
     @JsonProperty("character")
@@ -93,12 +93,12 @@ public class CreditBasic extends AbstractJsonMapping implements Serializable, II
         this.id = id;
     }
 
-    public String getPosterPath() {
-        return posterPath;
+    public String getArtworkPath() {
+        return artworkPath;
     }
 
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
+    public void setArtworkPath(String artworkPath) {
+        this.artworkPath = artworkPath;
     }
 
     public String getCharacter() {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/CreditMovieBasic.java b/src/main/java/com/omertron/themoviedbapi/model/credits/CreditMovieBasic.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/model/person/CreditMovieBasic.java
rename to src/main/java/com/omertron/themoviedbapi/model/credits/CreditMovieBasic.java
index 89fe75d05..ae0c61d79 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/CreditMovieBasic.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/credits/CreditMovieBasic.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.person;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.enumeration.MediaType;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/CreditTVBasic.java b/src/main/java/com/omertron/themoviedbapi/model/credits/CreditTVBasic.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/model/person/CreditTVBasic.java
rename to src/main/java/com/omertron/themoviedbapi/model/credits/CreditTVBasic.java
index c0dfd4ba5..27a130d68 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/CreditTVBasic.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/credits/CreditTVBasic.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.person;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.enumeration.MediaType;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCredit.java b/src/main/java/com/omertron/themoviedbapi/model/credits/MediaCredit.java
similarity index 88%
rename from src/main/java/com/omertron/themoviedbapi/model/media/MediaCredit.java
rename to src/main/java/com/omertron/themoviedbapi/model/credits/MediaCredit.java
index 6724f488a..13aefa9ba 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCredit.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/credits/MediaCredit.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.media;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.interfaces.IIdentification;
@@ -37,7 +37,7 @@ public class MediaCredit extends AbstractJsonMapping implements Serializable, II
     @JsonProperty("id")
     private int id;
     @JsonProperty("profile_path")
-    private String profilePath;
+    private String artworkPath;
     @JsonProperty("name")
     private String name;
 
@@ -59,12 +59,12 @@ public class MediaCredit extends AbstractJsonMapping implements Serializable, II
         this.id = id;
     }
 
-    public String getProfilePath() {
-        return profilePath;
+    public String getArtworkPath() {
+        return artworkPath;
     }
 
-    public void setProfilePath(String profilePath) {
-        this.profilePath = profilePath;
+    public void setArtworkPath(String artworkPath) {
+        this.artworkPath = artworkPath;
     }
 
     public String getName() {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCast.java b/src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCast.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCast.java
rename to src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCast.java
index c4228f1a4..87a6a805e 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCast.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCast.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.media;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCrew.java b/src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCrew.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCrew.java
rename to src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCrew.java
index d83103c90..f3e9d6aab 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCrew.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCrew.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.media;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java
index 5ec70b283..23a359564 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java
@@ -19,6 +19,8 @@
  */
 package com.omertron.themoviedbapi.model.media;
 
+import com.omertron.themoviedbapi.model.credits.MediaCreditCrew;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.omertron.themoviedbapi.model.AbstractJsonMapping;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java
index 6ab890c0b..15b3d92fb 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java
@@ -32,8 +32,8 @@ import com.omertron.themoviedbapi.model.artwork.Artwork;
 import com.omertron.themoviedbapi.model.collection.Collection;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.list.UserList;
-import com.omertron.themoviedbapi.model.media.MediaCreditCast;
-import com.omertron.themoviedbapi.model.media.MediaCreditCrew;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCrew;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.review.Review;
 import com.omertron.themoviedbapi.results.WrapperAlternativeTitles;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredits.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditList.java
similarity index 90%
rename from src/main/java/com/omertron/themoviedbapi/model/person/PersonCredits.java
rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditList.java
index 1c9ecb8ad..a99eda81a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredits.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditList.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model.person;
 
+import com.omertron.themoviedbapi.model.credits.CreditBasic;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.omertron.themoviedbapi.interfaces.IIdentification;
@@ -30,7 +31,7 @@ import java.util.List;
  * @author stuart.boston
  * @param <T>
  */
-public class PersonCredits<T extends CreditBasic> extends AbstractJsonMapping implements Serializable, IIdentification {
+public class PersonCreditList<T extends CreditBasic> extends AbstractJsonMapping implements Serializable, IIdentification {
 
     private static final long serialVersionUID = 4L;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditsMixIn.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditsMixIn.java
index a3fe866cb..f422e65be 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditsMixIn.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCreditsMixIn.java
@@ -19,6 +19,9 @@
  */
 package com.omertron.themoviedbapi.model.person;
 
+import com.omertron.themoviedbapi.model.credits.CreditBasic;
+import com.omertron.themoviedbapi.model.credits.CreditTVBasic;
+import com.omertron.themoviedbapi.model.credits.CreditMovieBasic;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeInfo.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeInfo.java
index 8d45e597f..462880cea 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeInfo.java
@@ -20,8 +20,8 @@
 package com.omertron.themoviedbapi.model.tv;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.media.MediaCreditCast;
-import com.omertron.themoviedbapi.model.media.MediaCreditCrew;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCrew;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbEpisodesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbEpisodesTest.java
index 356d9f286..02f9016d5 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbEpisodesTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbEpisodesTest.java
@@ -27,7 +27,7 @@ import com.omertron.themoviedbapi.TestSuite;
 import com.omertron.themoviedbapi.enumeration.ArtworkType;
 import com.omertron.themoviedbapi.model.StatusCode;
 import com.omertron.themoviedbapi.model.artwork.Artwork;
-import com.omertron.themoviedbapi.model.media.MediaCreditCast;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.media.MediaState;
 import com.omertron.themoviedbapi.model.media.Video;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java
index f045a7a64..8dbb62078 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java
@@ -31,7 +31,7 @@ import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
 import com.omertron.themoviedbapi.model.change.ChangeListItem;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.list.UserList;
-import com.omertron.themoviedbapi.model.media.MediaCreditCast;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.media.MediaState;
 import com.omertron.themoviedbapi.model.media.AlternativeTitle;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java
index f5a58b78d..82f8d4160 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java
@@ -29,12 +29,12 @@ import com.omertron.themoviedbapi.model.artwork.Artwork;
 import com.omertron.themoviedbapi.model.artwork.ArtworkMedia;
 import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
 import com.omertron.themoviedbapi.model.change.ChangeListItem;
-import com.omertron.themoviedbapi.model.person.CreditBasic;
-import com.omertron.themoviedbapi.model.person.CreditMovieBasic;
-import com.omertron.themoviedbapi.model.person.CreditTVBasic;
+import com.omertron.themoviedbapi.model.credits.CreditBasic;
+import com.omertron.themoviedbapi.model.credits.CreditMovieBasic;
+import com.omertron.themoviedbapi.model.credits.CreditTVBasic;
 import com.omertron.themoviedbapi.model.person.ExternalID;
 import com.omertron.themoviedbapi.model.person.Person;
-import com.omertron.themoviedbapi.model.person.PersonCredits;
+import com.omertron.themoviedbapi.model.person.PersonCreditList;
 import com.omertron.themoviedbapi.model.person.PersonFind;
 import com.omertron.themoviedbapi.results.ResultList;
 import com.omertron.themoviedbapi.tools.MethodBase;
@@ -116,7 +116,7 @@ public class TmdbPeopleTest extends AbstractTests {
         String[] appendToResponse = null;
 
         for (TestID test : testIDs) {
-            PersonCredits<CreditMovieBasic> result = instance.getPersonMovieCredits(test.getTmdb(), language, appendToResponse);
+            PersonCreditList<CreditMovieBasic> result = instance.getPersonMovieCredits(test.getTmdb(), language, appendToResponse);
             LOG.info("ID: {}, # Cast: {}, # Crew: {}", result.getId(), result.getCast().size(), result.getCrew().size());
             assertEquals("Incorrect ID", test.getTmdb(), result.getId());
             TestSuite.test(result.getCast(), "Cast");
@@ -140,7 +140,7 @@ public class TmdbPeopleTest extends AbstractTests {
         String[] appendToResponse = null;
 
         for (TestID test : testIDs) {
-            PersonCredits<CreditTVBasic> result = instance.getPersonTVCredits(test.getTmdb(), language, appendToResponse);
+            PersonCreditList<CreditTVBasic> result = instance.getPersonTVCredits(test.getTmdb(), language, appendToResponse);
             LOG.info("ID: {}, # Cast: {}, # Crew: {}", result.getId(), result.getCast().size(), result.getCrew().size());
             assertEquals("Incorrect ID", test.getTmdb(), result.getId());
             TestSuite.test(result.getCast(), "Cast");
@@ -164,7 +164,7 @@ public class TmdbPeopleTest extends AbstractTests {
         String[] appendToResponse = null;
 
         for (TestID test : testIDs) {
-            PersonCredits<CreditBasic> result = instance.getPersonCombinedCredits(test.getTmdb(), language, appendToResponse);
+            PersonCreditList<CreditBasic> result = instance.getPersonCombinedCredits(test.getTmdb(), language, appendToResponse);
             LOG.info("ID: {}, # Cast: {}, # Crew: {}", result.getId(), result.getCast().size(), result.getCrew().size());
             assertEquals("Incorrect ID", test.getTmdb(), result.getId());
             TestSuite.test(result.getCast(), "Cast");
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java
index b01e682a7..3348cd230 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java
@@ -26,7 +26,7 @@ import com.omertron.themoviedbapi.TestID;
 import com.omertron.themoviedbapi.TestSuite;
 import com.omertron.themoviedbapi.enumeration.ArtworkType;
 import com.omertron.themoviedbapi.model.artwork.Artwork;
-import com.omertron.themoviedbapi.model.media.MediaCreditCast;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.media.MediaState;
 import com.omertron.themoviedbapi.model.media.Video;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java
index 0f38812e0..10aed1cf7 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java
@@ -30,7 +30,7 @@ import com.omertron.themoviedbapi.model.artwork.Artwork;
 import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
 import com.omertron.themoviedbapi.model.change.ChangeListItem;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
-import com.omertron.themoviedbapi.model.media.MediaCreditCast;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.media.MediaState;
 import com.omertron.themoviedbapi.model.media.AlternativeTitle;